A slight bit of refactoring