clean structure up a bit