Started to rework readability of manager.cpp.