Cleaned up headers

Cleaned up headers