Simple improvements

- rdoc
- code readability improvment
- one method was moved to protected