Code style tweak
Refactoring