Improve class7 exercises