Bit of refactor