Cleanup code
Update version number