Refactoring and notes from review with Tristan