Code tidy and font color changes