refactroing going well