Make names more descriptive

* Make methods private