Quick refactor - only init the structs when necessary