Move refactoring to flyer2.c