Refactor and Reorder for clarity and consistency
Merge pull request #8 from glovell/master

Small refactoring to reduce length of several methods, reorganize to group similar methods together