some cleanup and change in font color