Improve class6 exercises