Update pom to be compatible with uploading to maven central
Minor method refactor