Small changes/refactoring