Missing refactoring. Update pom to use Java 1.6
Cleanups and refactoring. On heart_scale, the output now seems to be
exactly the same.