Clearer logic :beers:
Cleanup logic