Clean up code
Update version number