[PATCH 0/8] reduce indentation