updated code to make it more readable