structure cleaned and added some h5bp suggested components