The previous implementation was both hard to follow and repeated itself, making changes quite error-prone. Refactor this to be a bit more easier to reason about.
