Code cleanup

Cleaned up a lot of the markup.