Move color formatting elsewhere in code