Improved Class 4 comments