made struct declarations actually sane