* Conform more code to strict null checking * Delint * Iterate PR based on feedback
Co-authored-by: Janne Mareike Koschinski <janne@kuschku.de>