Minor cosmetic changes/refactoring