code cleanup and pom refactoring.