Fix indentation and class names