Refactoring URLs usage with a helper class
Cleaning some code