Implements some scrutinizer suggestions.