Fix model files to match JSHint
Merge