More tab cleanup