Improve readability

A changed a few cosmetic details that catched my attention while reading the code.
Thanks for publishing this template!