more HSP code tidiness courtesy of Sonar