Set of minor refactoring changes