Third Commit.
Cleaned up a bit of code. Things are formatted much better.