[codestyle] Removing some lint warnings