rm'd trailing underscore from state variables