Cleaned up interval_macros