Cleaned up for v0.2 release