minor (very)
minor refactorings
some refactorings + another term filter