different colors, code cleanup