Refactor lich giang day
Finish lich