indentation refactored