Code refactor
Add build to pom