Mini-refactor