removed unnessesary objects and updated plugin formatting