Improve class5 exercises