Change methods to lambdas