Fixed up tabbing to match Steve's work.