reformat code
this. and final application