added review comments: changed formatting to spaces only and changed the discovery timeout to 60

Signed-off-by: Andre Fuechsel <a.fuechsel@telekom.de>