Major cleanup, release 0.3.0