Working on prettier URLs, optimizing the code -ns