Some edits and removing trailing spaces (this may be a losing battle)