Updated Enums for Java 7 & Removed  decompiler comments