Fix end alignment and case indentation