Comments and JavaDoc completed