Minor refactoring and request improvement