srs refactoring