Refactoring and default values for map bounds