Another small refactor