Lambda removal and @author