...a bit of housekeeping

Extracted a couple methods and whatnot
...some more housekeeping