Refactoring problems 2 & 3
Merge pull request #1 from erik-johnson/master

Refactoring