Cleaned up header and body area