Improve function

Add pictures in favor of the class name.