refactoring
Merge pull request #1 from JoelHoskin/refactoring

Mucho refactoring!