remove pass
Rename type variable for state from 'r' to 's'