Better alfred uid handling and code cleaning