Refactoring and a font color tweak.