Additional improvements from exercises