Corrected 6 errors reported by SensioLabs Insights