Refactoring: moving code around.