apply review comments
use one RegExp with multiple characters instead of multiple RegExp with one characters