Code clean-up with a some minor adjustments
Code clean-up with a few minor adjustments