Starting code refactor with a clean working directory