Cleaned up the header a bit