formatting and some nits