Code cleanup and fix for colors use with loggers output.