Fixed return type & CSS class name