improve regex expression