[codestyle] Fixing some lint errors