Simplify a bit, fix misprint

[ci skip]