Refactored voice control a bit