Cleaned up some JS re JSHint recommendations