Rampant JavaDoc Rampage on the API + refactoring