code cleanup
Merge pull request #11 from briandrawert/refactor

code cleanup