Manufacturer and deviceModel updated
refactor