minor refacro