Some small refactoring changes