Updated variable name
Clean up some code