I copy-pasted the original implementation to keep the codebase consistent, but I totally agree with you :+1: 

Let me do that on the controllers too.