Some code cleanup, Added colorize gem