Cleaned code and expanded the `__()` method