Clean up my copy/paste badness