misc indent cleanup