Minor refactoring on Speech