[TASK] Cleanups required by code standards

Once more, excuse direct push - needed in order to fix pull request verifications.