Updated the readability of the code