Some cleanup and added the non-Leo listmanager.py