Cleans up SrrInfo code