some improves and remove unnecessary code