FIX: Slightly cleaner [ci skip]