Move make plot to util