A bit refactoring.