Fix styling and uncommitted pom changes