Bit of refactoring…