Apply suggestions from code review

Co-Authored-By: Jakub Drozdek <[email protected]>
Co-Authored-By: Kamil Stepczuk <[email protected]>

Author: 3 people