bae: ws and tab cleanup