Cleaned up H5BP code