Cleanup for JSHint