Reformatted a whole bunch of stuff in order to increase readability and
organization.