Tweaked BOM script to clean up.