Polish the structure