Justin - Created comments and general code cleaning