fix code order