Fixed regexp and style