Styling fixes and removed unnecessary regexp flag