updated headers to be more consistent