While this section is being cleaned up, could we replace the brackets with `do` and `end` for multiline blocks?