Cleaned up main core header.