Minor code clean-up

Minor code clean-up