* remove duplicate validity check * Apply suggestions from code review * add leftover --------- Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
Co-authored-by: Franck Nijhof <frenck@frenck.nl>