Small refacatoring