[Fix] Modified dict{} logic and output cleaning