minor spider refactoring