Improve order of requires