cleaned up header guards