Some clean up.
Release 0.5.0