cleanup and add color