Bulk refactor and clean(er) ups