Future

Merge Conflict

114: Clean Code Styling