Code re-formatting of constants