Clean up some redundancy