Normalizes variable naming so that it adheres to our coding style While we're at it do minor cleanup relating to modified lines
Normalizes variable naming so that it adheres to our coding style While we're at it do minor cleanup relating to modified lines