(RISCV) Clean a bit the code.