Format
Move Field outside of Struct
Change name to type in Struct so it's more clear