Fix some multiline issues, remove ball class