Cleanup due to feedback from PR
Minor colde cleanup due toe feedback on PR