Added formatting functionality