Improving readability of the source code