remove trailing whitespace and fix blank line between method