Simplify classes output, fix underscore issue