refactor for class
fix class nesting
Merge pull request #1 from rismoney/all_banged_up

fixed class nesting