Add additional formatting for variables and ...