Minor changes/refactorings