some reformation of code
some reformation of code