Improve class4 exercises