fix suggessions from sensiolabs insight

Connected to the #254  ticket, fix some of the suggested sensiolabsinsight errors