refactor of original code complete
Merge pull request #2 from pstevensza/clean_up

refactor of original code complete