Remove some unneeded lines
Replace some #defines with NS_ENUM