Fix class statements