refactors

Will @ElizabethU merge me? :8ball: