Implements Scrutinizer suggestions.