Cleaned up headers