Adds minor fixes according insight.sensiolabs.com review