Reduce redundancy and boldface logic names