state variable changes

Removes trailing underscores from state variables