minor changes / refactoring