cleaned up Actor