[Misc] Minor structure improvements