Some JavaDoc + UnitTests + Refactoring