[DEV] Small refactorings