cleaned up pom and class