minor cleanup
stuff
DRYing up the mode file loading