Increase readability of manager.py