refs #734 : SensioLabsInsight review : Code should not be duplicated