Clean up weird newlines & final modifiers