Change to NS_OPTIONS from NS_ENUM.
a little refactoring.