Refactor holmes application management