Added minor enhancements, colorize and exception