I guess this counts as refactoring?