Code Cleanup

-edited files to comply with the coding standards
-removed unnecessary codes
-removed console.logs