Added some JavaDoc
Added some JavaDoc