Remove underscores from variable names, per updated style guidelines
Miscellaneous style fixes
Release v1.7.4: update code for new style guide