Cleaning up intro and using a few of the newer conventions there.