removed non dry code