Add saner name for variable named 'what'
Merge pull request #413 from ifarkas/saner_variable_names

Add saner name for variable named 'what'