Use some instead (first (keep ..)) & other refactorings