Do minor cleanup
Merge pull request #1 from jvazquez-r7/land_3433

Do minor cleanup