Use regexs instead of hacky spaces