Improve class8 exercises