Cleanup and JavaDoc