Cleanup and a little testing