cleanup and bump to 0.5.1