Fixed some structure