init commit of refactor