Some code improvements

Some code improvements – no new features.

- Code clean-up
- Missing annotations added
- Missing javadoc tags added /  broken javadoc code tags removed
- Some minor code improvements