Some code cleanups

Signed-off-by: Marvin Wegener mw197@web.de