Simplyfied factor normalization
Cleaned up loading of config files