Cleaner class names