Minor style cleanup
Refactoring