refactor class names, rendering callback