Removed self.args and changed code accordingly