Changing syntax for speech command and some cleanup.