Merge pull request #1364 from coffeedogs/final_code_quality_6

Changes based on style and lint checks. (final_code_quality_6)

Author: coffeedogs