Fix warnings
Remove trailing whitespace