I'm fine removing the `return` if you think it's a broken window. In fact, I like it gone. I will do that shortly :)