snids refactoring