Minor refactoring
Give priority to popular files