Minor exploratory refactoring.

R# recommendations, consistent casing, etc.