Fixed some (too) long logical statements to agree with PEP8
Merge branch 'bug/fixFUGUEsettings' into experimental