Fixes Issue #2 (enum) - more refactoring to new code standards