Change some code to make the code easier to read