Code cleanup

Some cleanup of code and pom