HOPKINS: Clean up loops