Bit of Refactoring