More colorizing and moving funcion calls to a better place.