Cleanup and a little test