Formatting fixes and deletion of trailing whitespace