Updated Maven pom dependency, minor clean up