Tab count update fix + whitespace cleanup.