Rebase fix lint

Created by: bodnara

This was perhaps not the smartest way to do it but here we are. Only the last commit needs to be checked, rest was already review.