Made the structure better