Make codes more clean