fixing spacing and comments