Tom Canac Some refactoring