cleaner implementation with mando