minor refactoring maintenance