minor tweaks
cleaning up
Revert "cleaning up"

This reverts commit 0311c5878b6e1ab13bd2fa3a70aad9dab8adfede.
new commit