tidy up default structure