Cleaning up poms a little