Adding condition for device type
Doc and indent