cleanup code

properly formatted code, cleaned up and improved UrlUtilsSpec with
expect / where, using Map for mappings instead of ConfigObject