Cleaned up struct, removed extra card names