clean up repeated vars