Clean code
Add comments
Work on pom