Cleanups
Improve repositories management