Continued rrefactoring