Apply suggested scrutinizer changes

Fixes #32