Minor changes / refactoring