[Suggestions] Cleanup