Fixed spacing and the problem with the comment being exposed.