Clean up and increased version number