Improvements based on SensioLabsInsights analysis

Refs https://insight.sensiolabs.com/projects/eceb78a9-38d4-4ad5-8b6b-b52f323e3549