some refactoring
Merge pull request #2 from fiddler-crabs-2014/Ken-Keaty

some refactoring