JavaDoc comments added.
Removed unused imports and todo comments.
Typos.