Minor code cleanup

* Organize Imports, strip unnecessary imports
* All Generics parameterized
* Added Javadoc comments to date constraints
* Fix build warnings and errors about Javadoc