Clean code, auto-format to Java Conventions