refacts - part 2