Added JavaDoc/comments