Cleanups for challenge 7 in Java
More work on Challenge 2, still no dice