Remove duplicate code
Fixed default severities, some null values