fixed some spacing and comments