- clean up redundancy