Minor refactoringf fix...