Use constants for IFOs
Cleanup headers
Cleanup headers