cleanups to the uniform handling