Stylistic adjustment and add missed __all__.