ADD: solarQube, removed comments, fixed formating
FIX: NPE
ADD: set watchdog interval