Fixed warning
Clean up