Cleanup and bump to 0.9.5