[minor] Things from our discussion
[minor] small refactoring that breaks things :)