Fixed refactoring shet