Clean up the implementation a little.