removed leading underscores
Rearanged defines.py