Fixed indentation except for resolve gates