Update: clean the codes