fix CS and issues reported by SensioLabs Insight