clean up expiration date calculations, tidy up charts