Change method signature and some reformat