Changed a few things to make it slightly more readable