Refactor a Bit