Merge "Pylint and PEP8 fixes for color.py"