Added footer and did some cleanup