Tweak load order
A little clean up