Few miscellaneous cleanups to simplify logic
Merge pull request #58 from ryanathasoffers/misc_cleanup_4

Few miscellaneous cleanups to simplify logic