Cleanup and version update to 0.0.4