Updated POM

Cleaned source code