Clean up better