Some updated to the comments and JavaDoc