Quickfix

A bit more basic cleanup