small refactoring done