Minor tweak
Code clean-up