Fixed some 'Avoid Duplicate Literals' issues