Less Camel Case. Removed unnecesary members from structs