Move comment to docstring
Simplify implementation and make clearer using new string formatting