Some small code cleanup
Changed some #defines to meet naming conventions