Fixed imports (and trailing whitespace) in multiple files