formating the refactor