Refactoring to more proper class structure, variable names, etc.
Refactor.