Let's clean a bit