Improve code quality of the service host manager