Make the structure better