Code cleanup.

Signed-off-by: Rüdiger Sonderfeld <ruediger@c-plusplus.de>