Some cleanup for JSHint