Minor refactoring
v9.04 minor refactoring