Code Sauber

Signed-off-by: Philipp Liepert <philipp@phillsoft.de>