Improve class3 exercises