Code cleanup and footer added