Clenaup, improved consistency