refactored a bit the roadmakers
Refactored a couple of files