let's call it minor refactoring