Got rid of unnessecary stuff & did some code cleanup