Refactoring
fixes