CMO-3527 (Remove unnecessary line breaks"

Also some spacing fixes