Updated readability of the code.