Formatting fixes, remove trailing spaces