Refactoring __all__