Minor refatoring