minor refactoring on more info