Modified Commenting to comply with JavaDoc and refactoring