cleanup, better var name