Removed args variable and changed design