Cleaned up for 0.0.3 release