Improve style of ConnectionManager