Simplify fly code