Adding Apache 2.0 license to Java files
Added comments to all non-test classes
Removing commented out code
Removing more dead code