Consistent function naming
Add SR info fetcher
Remove not used imports