minor refactoring to meet interface fix
refactoring not needed; reverted