Update libraries to latest versions
Code cosmetics