Improves markup and class names