A few reformating to make it more readable