Remove color generator from containing function