Tidy up state instance variables