Refactor some more