Dragonfly91 code fixer

A continuation of #128.