cleaning up my code and working on comments