- Updated and cleanup (APIs, some JavaDoc)