Fixed comments spacing and words