style cleanup per @mc10's feedback