correct ident & simplify