Updated all pom URLs and make cosmetic cleanup changes