Revert "minor touch ups"

This reverts commit 977143d54ddefbc4311e107703dec4f3759c3169.