refactored several methods, eliminated whitespace
Merge pull request #1 from jwhitis/refactor

refactored several methods, eliminated whitespace