clean up some redundancy