fixed spacing and comments