Added comments in code, did clean up