Proposing refactoring
Merge pull request #2 from defrag/cleanup

Proposing refactoring