formatting improvments