Refactor classes for readability
Merge pull request #6 from taufikobet/master

Refactor classes for readability