Apply suggestions from code review

Co-authored-by: Christoph Braun <[email protected]>

Author: elf-pavlik