Remove debugging
organize imports
Cleanup ALL the code!
Re-format again
Add missing javadocs