Small refatoring