Added some JavaDoc Comments