Code cleaning. POM updates