finished refactoring dssr parser