minor tweaks
Merge pull request #1877 from cordoval/clean-up

minor tweaks