Removing redundant throws clause
Renaming to be more appropriate
cleaning up pom.xml