#928 code refactor
#928 adopting modern NS_ENUM macro