partially aborted minirefactoring