Scrutinizer rewrite
Minor improvements