Make POM more readable