up #481: move code in the data structure @VANTHONG