cleaned up comments and puts statements