Update setup

Some Little clean ups for the Setup

Signed-off-by: Marvin Wegener <mw197@web.de>