Updated the code to make it more readable