Fixing code style  per PR comments