Clean HorusYap a bit