Fix code order