general fix
refactoring