Clean up for JSHint