Refactor modprobes