general code clean