refactor of the code
small tweaks. Added work to be done tomorrow
Merge pull request #4 from joecollins/refactor

Refactor