Lint warnings cleanup