Make skip condition cleaner