Changed 2 settings fo 'labelenum' and removed redundant code.