Lil Bit of Refactoring