A few changes to make it easier to read and expand upon in the future.