Update to readability and correct formatting based mostly on
livibetter's comments and advice.