Cleanup and update README