Fix style and match version.