Removal of duplicit enumeration and unnecessary conditions.

Correction of my previous pull request.