BaseInd: formatting, cleanup