Revise of Classes

Updates JavaDoc. Minor Code Cleanup. Makes inner enums static.