Extremly cleaned up

Signed-off-by: logineimer <logineimer@googlemail.com>