Cleaned out enums
Merge branch 'EnumCleanup' into dev