code quality improvement: reduced lint warnings to code