Remove a few technical debts regarding issues detected by the linter
This change set addresses #434 (closed), #438 (closed) and #439 (closed) - which are all related to issues detected by the linter and specifically ignored by us in the past.
This change set addresses #434 (closed), #438 (closed) and #439 (closed) - which are all related to issues detected by the linter and specifically ignored by us in the past.