remove some cruft, ++pretty