wrap long lines
drop unused variables
add another exception
Merge remote-tracking branch 'forge/master'