add get some clean code