[*] Small refactoring