Match delta config more to main config
Basic cleanup to code and comments