Fix hyphens - some refact + remove code to helper class