Finished converting anonymous inner classes to lambdas