cleaned up headers