cleanup spacing and comments