Apply suggestions from code review

Co-Authored-By: Jakub Drozdek <30927218+jakubdrozdek@users.noreply.github.com>
Co-Authored-By: Kamil Stepczuk <5058678+stepek@users.noreply.github.com>

Author: 3 people