Update tabbing to make it more clear