minor refactoring with base urls