refactoring juniper
refactoring juniper