Style fixes and small adjustments in regular expressions used in