- Comments and JavaDocs added