clean up
replace with method reference