Finally took time to clean up the headers.