Improve inline comments
v2.2.0