Fixed spacing and comments