Clean up, and release 0.2.3