improved a bit lengthy statements