- Update JavaDoc and add comments