TASK-5: cleaning naming conventions on class members
Merge pull request #7 from nickoram/master

TASK-5: cleaning naming conventions on class members