improved regex & added support for optional space after `-`