Responses to PR comments

- Remove javadocs
- Refactor minor parts for readability