some cleanup
Fix a missing struct size calculation