JSHint changes

A few changes to help enforce style matching