a bit of cleaning-up for mjolnir