Cleanup and Footer

Cleaned up the code a bit and added a footer.