Improved }m and processed Sjors' review

Tested: no