Develop

Formatted code and comments :walking: