Complete normalize integration
move functions out of settings file