cleaned up some redundancy