fix structure a little