beautified
added defaults