Improve code quality, format, mavenise