tweaks and moving some things up to the class level
Merge pull request #2 from justinperkins/pull_requests

tweaks and moving some things up to the class level