Refactoring configuration steps