Cosmetic changes (trailing spaces removed, etc)
;