Cleanup to match OBA code style in POM