Minor code cleanup for color generation