refactoring
fixes