Just trying to clean it up