Cleaning up duplicate hard-coded strings, and various other minor style issues.