Standardise formatting and fix maven 3.1.1 jfx plugin issue