Minor refacturing