Clean up object.py