cleaning up redundentcy