hammerhead tidy-up

Tested on Jolla – all ok