Bit Of Refactoring