Fix readability of code