Refactoring and Route Detail Activity work