MINOR Improvements based on Scrutinizer feedback.