Fixes based Tofe's review

Fixes based on Tofe's review (binding & cleanup)