Simplify conditional statements
Simplify merging of user configuration

Don't reimplement dict.update() stupid!
Remove unused variable
Rename variable - Purely cosmetic