Added Device Adress search
Fixed indentation