working on comments and cleaning up code