minor refactoring update