Pla 1848

Since we're not using the return, maybe we can convert this block and the command below into if-else?