Continue with addressing review feedback part two: 
- rename enum members
- add checking for out of memory errors on allocation