Bump minor version
Clean up a bit