Fix spacing and comments