Fix colors and remove comments