Added some polish to make the offering easier to work with