Cleanup with magic formula by Eike!