Modified the load_..._dictionary routines to use "elif"

Cleanup directory load routines.