Removed unnecessary variable
Automatic label generation and updated visitor/operator