Fix comments
Object size should include the trailing padding
Avoid using literal struct