Improved terminology

Replaced int state with enum Tool and selectedTool variable