Changed formatting of core functions