More method extraction, moved some state information to object