Minor refactorin