Minor readability improvements in the source code