some refactoring, font color, font family