refactored from talk with mike h
Merge pull request #6 from Hollyw00d/refactor-from-talk-with-mike-h

refactored from talk with mike h