cleanup with indentation