reformat and refactor

reformate and refactor
those were the only changes
another refactor

another rafactor
I think these names are useful this time