cleaning up redundancy