Cleaning up code to make it more readable