Fix code complexity ?