Changed pom and cleaned code a little bit