combine #ifdefs / fix little indent mistakes