Refactoring bits