change some inner classes with default method to use "()->xxx" style