Some Cleanups

Signed-off-by: Andre Schweiger <andre.spiele@yahoo.de>