fix ordering + space