Revert "Cleaned up a bit."

This reverts commit 7708802322a0e69ac5ae2f428fafac9bbe6b8eaf.
Revert "Put Figures at End."

This reverts commit ca437ee880a755c75d6fab6e76559ac157e41656.