made code simpler.