--Added pom comments
--Cleaning + formatting