Code optimization
Refactor holmes client application management