Little bit refactored.
default-Werte angepasst