Another small tuneup