Convert pom.xml to spaces for uniformity with code
Replace explicit type declarations
Convert if/else to switch