Clean up some javadoc, whitespace, naming conventions, etc.
Update copyrights