Class name and indentation need fixing here as well