Move product info code to a better location