Tab code cleanup. #92