Small refactoring and updated doc