Fixed violations reported by sensiolabs insight (https://insight.sensiolabs.com/projects/48c94828-ca0a-49df-817d-fa67ce31509e/analyses/1)