formatting, added defaults