cleaned up the order of ifdef's