Reorder code