Code polishing

Removed TODO
Added JavaDoc