Clean up, playing around with testing.