minor refactoring does not help much