Even more clean