Took out the class definition

Hopefully a little more simple