improving comments and getting rid of some extra stuff