A few suggestions on src ordering code