Fix whitespaces & clean regexp in binding and queue providers