Fixed references and removed coloring.