Fixed ident assign and cleaned output