small refactoring etc