Small refactoring. Work to do yet...