Fixed the members of each class so they aren't stupidly done