Even more strictness clarity. And a bit of formatting.