Predefines, code cleanup