Cleanup by @zolotov