more refactoring rcp.py;