Minor improvements to getHardwareModel