Fixed a lot of structure and tiny formatting.