A bit refactoring