cleaned up the hs code somewhat