cleaning up all the ifdefs with cleaner defines