make code nicer

make code nicer