Task #59 Remove hardcoded URLs

Option[String]