code clean-up from PR comments