more refactoring - moving sp specific code into storm2model