clean up struct fields a bit