cleaned up header and footer