Improving the readability of the code