Cleaned up and commented in the POM