Cleanup better