Slightly changed subject area. 
Decreased complexity by deleting redundant intensification.

Overrided toString method in enums.